From 77a9539e07f300ccfe7155df9034d3ef78786cf7 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Tue, 13 May 2014 15:07:40 +0200 Subject: [PATCH] icontheme: Do a failed lookup at the beginning Do this to catch the g_warning() that the icontheme code emits the first time a lookup fails. --- testsuite/gtk/icontheme.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/testsuite/gtk/icontheme.c b/testsuite/gtk/icontheme.c index ff69715928..b32d622731 100644 --- a/testsuite/gtk/icontheme.c +++ b/testsuite/gtk/icontheme.c @@ -76,17 +76,10 @@ assert_icon_lookup_fails (const char *icon_name, gint size, GtkIconLookupFlags flags) { - static gboolean seen_could_not_find_message = FALSE; GtkIconInfo *info; - if (!seen_could_not_find_message) - g_test_expect_message ("Gtk", G_LOG_LEVEL_WARNING, "Could not find the icon*"); info = gtk_icon_theme_lookup_icon (get_test_icontheme (), icon_name, size, flags); - if (!seen_could_not_find_message) - { - g_test_assert_expected_messages (); - seen_could_not_find_message = TRUE; - } + if (info != NULL) { g_error ("Should not find an icon for \"%s\" with flags %s at size %d, but found \"%s\"", @@ -100,7 +93,17 @@ assert_icon_lookup_fails (const char *icon_name, static void test_basics (void) { + /* just a basic boring lookup so we know everything works */ assert_icon_lookup ("simple", 16, 0, "/icons/16x16/simple.png"); + + /* The first time an icon is looked up that doesn't exist, GTK spews a + * warning. + * We make that happen right here, so we can get rid of the warning + * and do failing lookups in other tests. + */ + g_test_expect_message ("Gtk", G_LOG_LEVEL_WARNING, "Could not find the icon*"); + assert_icon_lookup_fails ("this-icon-totally-does-not-exist", 16, 0); + g_test_assert_expected_messages (); } static void -- 2.30.2